From 6663cc051d05f0b04875f77d04ec60971247dcf2 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 27 Aug 2005 04:25:28 +0000 Subject: [PATCH] Don't warn when G_MAXLONG is passed as length. 2005-08-27 Matthias Clasen * gdk/x11/gdkproperty-x11.c (gdk_property_get): Don't warn when G_MAXLONG is passed as length. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ gdk/x11/gdkproperty-x11.c | 7 ++----- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index c872f2649d..ee6a14a7b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-08-27 Matthias Clasen + + * gdk/x11/gdkproperty-x11.c (gdk_property_get): Don't warn + when G_MAXLONG is passed as length. + 2005-08-26 Matthias Clasen * gtk/updateiconcache.c: Add a separate --ignore-theme-index option diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c872f2649d..ee6a14a7b2 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2005-08-27 Matthias Clasen + + * gdk/x11/gdkproperty-x11.c (gdk_property_get): Don't warn + when G_MAXLONG is passed as length. + 2005-08-26 Matthias Clasen * gtk/updateiconcache.c: Add a separate --ignore-theme-index option diff --git a/gdk/x11/gdkproperty-x11.c b/gdk/x11/gdkproperty-x11.c index e1f5d77f0d..8edafaa57e 100644 --- a/gdk/x11/gdkproperty-x11.c +++ b/gdk/x11/gdkproperty-x11.c @@ -530,11 +530,8 @@ gdk_property_get (GdkWindow *window, */ get_length = length + 3; if (get_length > G_MAXLONG) - { - g_warning ("gdk_property_get(): length value has wrapped in calculation " - "(did you pass G_MAXLONG?)"); - get_length = G_MAXLONG; - } + get_length = G_MAXLONG; + /* To fail, either the user passed 0 or G_MAXULONG */ get_length = get_length / 4; if (get_length == 0) -- 2.30.2